diff --git a/packages/async-queue/src/lib/AsyncQueue.ts b/packages/async-queue/src/lib/AsyncQueue.ts
index db23bfc812..5ef68bc50f 100644
--- a/packages/async-queue/src/lib/AsyncQueue.ts
+++ b/packages/async-queue/src/lib/AsyncQueue.ts
@@ -23,7 +23,7 @@ export class AsyncQueue {
 	/**
 	 * The promises array
 	 */
-	private promises: AsyncQueueEntry[] = [];
+	private readonly promises: AsyncQueueEntry[] = [];
 
 	/**
 	 * Waits for last promise and queues a new one
diff --git a/packages/decorators/src/base-decorators.ts b/packages/decorators/src/base-decorators.ts
index b5af3b2118..b93b283ccd 100644
--- a/packages/decorators/src/base-decorators.ts
+++ b/packages/decorators/src/base-decorators.ts
@@ -1,4 +1,3 @@
-import type { NonNullObject } from '@sapphire/utilities';
 import { createMethodDecorator } from './utils';
 
 /**
@@ -6,11 +5,11 @@ import { createMethodDecorator } from './utils';
  * @param value Whether the property should be enumerable or not
  */
 export function Enumerable(value: boolean) {
-	return (target: unknown, key: string) => {
-		Reflect.defineProperty(target as NonNullObject, key, {
+	return (target: object, key: string) => {
+		Reflect.defineProperty(target, key, {
 			enumerable: value,
 			set(this: unknown, val: unknown) {
-				Reflect.defineProperty(this as NonNullObject, key, {
+				Reflect.defineProperty(this as object, key, {
 					configurable: true,
 					enumerable: value,
 					value: val,
diff --git a/packages/discord-utilities/src/lib/InteractionOptionResolver.ts b/packages/discord-utilities/src/lib/InteractionOptionResolver.ts
index ee46b11955..c8af9cfb27 100644
--- a/packages/discord-utilities/src/lib/InteractionOptionResolver.ts
+++ b/packages/discord-utilities/src/lib/InteractionOptionResolver.ts
@@ -10,7 +10,7 @@ import {
 	type APIApplicationCommandInteractionDataOption,
 	type APIApplicationCommandInteractionDataStringOption,
 	type APIAttachment,
-	type APIChatInputApplicationCommandInteractionDataResolved,
+	type APIInteractionDataResolved,
 	type APIInteractionDataResolvedChannel,
 	type APIInteractionDataResolvedGuildMember,
 	type APIMessage,
@@ -18,7 +18,7 @@ import {
 	type APIModalSubmitInteraction,
 	type APIRole,
 	type APIUser,
-	type APIUserApplicationCommandInteractionDataResolved
+	type APIUserInteractionDataResolved
 } from 'discord-api-types/v10';
 
 /**
@@ -37,8 +37,8 @@ export class InteractionOptionResolver {
 	 * The interaction resolved data
 	 */
 	private readonly resolved:
-		| APIChatInputApplicationCommandInteractionDataResolved
-		| APIUserApplicationCommandInteractionDataResolved
+		| APIInteractionDataResolved
+		| APIUserInteractionDataResolved
 		| APIMessageApplicationCommandInteractionDataResolved
 		| null = null;
 
@@ -80,14 +80,13 @@ export class InteractionOptionResolver {
 		}
 	}
 
-	public get(name: string, required?: boolean | false): APIApplicationCommandInteractionDataOption | null;
-	public get(name: string, required: true): APIApplicationCommandInteractionDataOption;
-
 	/**
 	 * Gets an option by its name
 	 * @param name The name of the option
 	 * @param required Whether to throw an error if the option is not found
 	 */
+	public get<Required extends boolean = false>(name: string, required?: Required): RequiredIf<Required, APIApplicationCommandInteractionDataOption>;
+
 	public get(name: string, required = false): APIApplicationCommandInteractionDataOption | null {
 		const option = this.hoistedOptions?.find((opt) => opt.name === name);
 		if (!option) {
@@ -101,13 +100,11 @@ export class InteractionOptionResolver {
 		return option;
 	}
 
-	public getSubcommand(required?: boolean | false): string | null;
-	public getSubcommand(required: true): string;
-
 	/**
 	 * Gets the selected subcommand
 	 * @param required Whether to throw an error if there is no subcommand
 	 */
+	public getSubcommand<Required extends boolean = false>(required?: Required): RequiredIf<Required, string>;
 	public getSubcommand(required = true): string | null {
 		if (required && !this.subcommand) {
 			throw new Error('A subcommand was not selected');
@@ -116,13 +113,11 @@ export class InteractionOptionResolver {
 		return this.subcommand;
 	}
 
-	public getSubcommandGroup(required?: boolean | false): string | null;
-	public getSubcommandGroup(required: true): string;
-
 	/**
 	 * Gets the selected subcommand group
 	 * @param required Whether to throw an error if there is no subcommand group
 	 */
+	public getSubcommandGroup<Required extends boolean = false>(required?: Required): RequiredIf<Required, string>;
 	public getSubcommandGroup(required = true): string | null {
 		if (required && !this.group) {
 			throw new Error('A subcommand group was not selected');
@@ -131,131 +126,120 @@ export class InteractionOptionResolver {
 		return this.group;
 	}
 
-	public getBoolean(name: string, required?: boolean | false): boolean | null;
-	public getBoolean(name: string, required: true): boolean;
-
 	/**
 	 * Gets a boolean option
 	 * @param name The name of the option
 	 * @param required Whether to throw an error if the option is not found
 	 */
+	public getBoolean<Required extends boolean = false>(name: string, required?: Required): RequiredIf<Required, boolean>;
 	public getBoolean(name: string, required = false): boolean | null {
 		const option = this.getTypedOption(name, ApplicationCommandOptionType.Boolean, required);
 		return option?.value ?? null;
 	}
 
-	public getChannel(name: string, required?: boolean | false): APIInteractionDataResolvedChannel | null;
-	public getChannel(name: string, required: true): APIInteractionDataResolvedChannel;
-
 	/**
 	 * Gets a channel option
 	 * @param name The name of the option
 	 * @param required Whether to throw an error if the option is not found
 	 */
+	public getChannel<Required extends boolean = false>(name: string, required?: Required): RequiredIf<Required, APIInteractionDataResolvedChannel>;
+
 	public getChannel(name: string, required = false): APIInteractionDataResolvedChannel | null {
 		const option = this.getTypedOption(name, ApplicationCommandOptionType.Channel, required);
 		return option && this.resolved && 'channels' in this.resolved ? (this.resolved.channels?.[option.value] ?? null) : null;
 	}
 
-	public getString(name: string, required?: boolean | false): string | null;
-	public getString(name: string, required: true): string;
-
 	/**
 	 * Gets a string option
 	 * @param name The name of the option
 	 * @param required Whether to throw an error if the option is not found
 	 */
+	public getString<Required extends boolean = false>(name: string, required?: Required): RequiredIf<Required, string>;
 	public getString(name: string, required = false): string | null {
 		const option = this.getTypedOption(name, ApplicationCommandOptionType.String, required);
 		return option?.value ?? null;
 	}
 
-	public getInteger(name: string, required?: boolean | false): number | null;
-	public getInteger(name: string, required: true): number;
-
 	/**
 	 * Gets an integer option
 	 * @param name The name of the option
 	 * @param required Whether to throw an error if the option is not found
 	 */
+	public getInteger<Required extends boolean = false>(name: string, required?: Required): RequiredIf<Required, number>;
 	public getInteger(name: string, required = false): number | null {
 		const option = this.getTypedOption(name, ApplicationCommandOptionType.Integer, required);
 		return option?.value ?? null;
 	}
 
-	public getNumber(name: string, required?: boolean | false): number | null;
-	public getNumber(name: string, required: true): number;
-
 	/**
 	 * Gets a number option
 	 * @param name The name of the option
 	 * @param required Whether to throw an error if the option is not found
 	 */
+	public getNumber<Required extends boolean = false>(name: string, required?: Required): RequiredIf<Required, number>;
 	public getNumber(name: string, required = false): number | null {
 		const option = this.getTypedOption(name, ApplicationCommandOptionType.Number, required);
 		return option?.value ?? null;
 	}
 
-	public getUser(name: string, required?: boolean | false): APIUser | null;
-	public getUser(name: string, required: true): APIUser;
-
 	/**
 	 * Gets a user option
 	 * @param name The name of the option
 	 * @param required Whether to throw an error if the option is not found
 	 */
+	public getUser<Required extends boolean = false>(name: string, required?: Required): RequiredIf<Required, APIUser>;
 	public getUser(name: string, required = false): APIUser | null {
 		const option = this.getTypedOption(name, ApplicationCommandOptionType.User, required);
 		return option && this.resolved && 'users' in this.resolved ? (this.resolved.users?.[option.value] ?? null) : null;
 	}
 
-	public getMember(name: string, required?: boolean | false): APIInteractionDataResolvedGuildMember | null;
-	public getMember(name: string, required: true): APIInteractionDataResolvedGuildMember;
-
 	/**
 	 * Gets a member option
 	 * @param name The name of the option
 	 * @param required Whether to throw an error if the option is not found
 	 */
+	public getMember<Required extends boolean = false>(
+		name: string,
+		required?: Required
+	): RequiredIf<Required, APIInteractionDataResolvedGuildMember>;
+
 	public getMember(name: string, required = false): APIInteractionDataResolvedGuildMember | null {
 		const option = this.getTypedOption(name, ApplicationCommandOptionType.User, required);
 		return option && this.resolved && 'members' in this.resolved ? (this.resolved.members?.[option.value] ?? null) : null;
 	}
 
-	public getRole(name: string, required?: boolean | false): APIRole | null;
-	public getRole(name: string, required: true): APIRole;
-
 	/**
 	 * Gets a role option
 	 * @param name The name of the option
 	 * @param required Whether to throw an error if the option is not found
 	 */
+	public getRole<Required extends boolean = false>(name: string, required?: Required): RequiredIf<Required, APIRole>;
 	public getRole(name: string, required = false): APIRole | null {
 		const option = this.getTypedOption(name, ApplicationCommandOptionType.Role, required);
 		return option && this.resolved && 'roles' in this.resolved ? (this.resolved.roles?.[option.value] ?? null) : null;
 	}
 
-	public getAttachment(name: string, required?: boolean | false): APIAttachment | null;
-	public getAttachment(name: string, required: true): APIAttachment;
-
 	/**
 	 * Gets an attachment option
 	 * @param name The name of the option
 	 * @param required Whether to throw an error if the option is not found
 	 */
+	public getAttachment<Required extends boolean = false>(name: string, required?: Required): RequiredIf<Required, APIAttachment>;
 	public getAttachment(name: string, required = false): APIAttachment | null {
 		const option = this.getTypedOption(name, ApplicationCommandOptionType.Attachment, required);
 		return option && this.resolved && 'attachments' in this.resolved ? (this.resolved.attachments?.[option.value] ?? null) : null;
 	}
 
-	public getMentionable(name: string, required?: boolean | false): APIUser | APIInteractionDataResolvedGuildMember | APIRole | null;
-	public getMentionable(name: string, required: true): APIUser | APIInteractionDataResolvedGuildMember | APIRole;
-
 	/**
 	 * Gets a mentionable option
 	 * @param name The name of the option
 	 * @param required Whether to throw an error if the option is not found
 	 */
+	public getMentionable<Required extends boolean = false>(
+		name: string,
+		required?: Required
+	): RequiredIf<Required, APIUser | APIInteractionDataResolvedGuildMember | APIRole>;
+
 	public getMentionable(name: string, required = false): APIUser | APIInteractionDataResolvedGuildMember | APIRole | null {
 		const option = this.getTypedOption(name, ApplicationCommandOptionType.Mentionable, required);
 
@@ -286,22 +270,20 @@ export class InteractionOptionResolver {
 			throw new Error('This method can only be used on user context menu interactions');
 		}
 
-		return (this.resolved as APIUserApplicationCommandInteractionDataResolved).users[this.interaction.data.target_id];
+		return (this.resolved as APIUserInteractionDataResolved).users[this.interaction.data.target_id];
 	}
 
-	public getTargetMember(required?: boolean | false): APIInteractionDataResolvedGuildMember | null;
-	public getTargetMember(required: true): APIInteractionDataResolvedGuildMember;
-
 	/**
 	 * Gets the target member for a context menu interaction
 	 * @param required Whether to throw an error if the member data is not present
 	 */
+	public getTargetMember<Required extends boolean = false>(required?: Required): RequiredIf<Required, APIInteractionDataResolvedGuildMember>;
 	public getTargetMember(required = false): APIInteractionDataResolvedGuildMember | null {
 		if (this.interaction.type !== InteractionType.ApplicationCommand || this.interaction.data.type !== ApplicationCommandType.User) {
 			throw new Error('This method can only be used on user context menu interactions');
 		}
 
-		const member = (this.resolved as APIUserApplicationCommandInteractionDataResolved).members?.[this.interaction.data.target_id] ?? null;
+		const member = (this.resolved as APIUserInteractionDataResolved).members?.[this.interaction.data.target_id] ?? null;
 
 		if (!member && required) {
 			throw new Error('Member data is not present');
@@ -345,13 +327,11 @@ export class InteractionOptionResolver {
 		return option;
 	}
 
-	private getTypedOption<Option extends BasicApplicationCommandOptionType>(
+	private getTypedOption<Option extends BasicApplicationCommandOptionType, Required extends boolean = false>(
 		name: string,
 		type: Option,
-		required?: boolean | false
-	): TypeToOptionMap[Option] | null;
-
-	private getTypedOption<Option extends BasicApplicationCommandOptionType>(name: string, type: Option, required: true): TypeToOptionMap[Option];
+		required: Required
+	): RequiredIf<Required, TypeToOptionMap[Option]>;
 
 	private getTypedOption<Option extends BasicApplicationCommandOptionType>(
 		name: string,
@@ -379,3 +359,11 @@ type _TypeToOptionMap = {
 type TypeToOptionMap = {
 	[Option in keyof _TypeToOptionMap]: _TypeToOptionMap[Option];
 };
+
+type If<Value extends boolean, TrueResult, FalseResult> = Value extends true
+	? TrueResult
+	: Value extends false
+		? FalseResult
+		: TrueResult | FalseResult;
+
+type RequiredIf<Value extends boolean, ValueType, FallbackType = null> = If<Value, ValueType, ValueType | FallbackType>;
diff --git a/packages/discord.js-utilities/src/lib/MessagePrompter/MessagePrompter.ts b/packages/discord.js-utilities/src/lib/MessagePrompter/MessagePrompter.ts
index 8ab5b2c991..964f29f898 100644
--- a/packages/discord.js-utilities/src/lib/MessagePrompter/MessagePrompter.ts
+++ b/packages/discord.js-utilities/src/lib/MessagePrompter/MessagePrompter.ts
@@ -146,7 +146,7 @@ export class MessagePrompter<S extends keyof StrategyReturns = 'confirm'> {
 	/**
 	 * The available strategies
 	 */
-	public static strategies: Map<
+	public static readonly strategies: Map<
 		keyof StrategyReturns,
 		Ctor<
 			| ConstructorParameters<typeof MessagePrompterConfirmStrategy>
diff --git a/packages/discord.js-utilities/src/lib/PaginatedMessages/PaginatedMessage.ts b/packages/discord.js-utilities/src/lib/PaginatedMessages/PaginatedMessage.ts
index 010a657da3..419cdf549a 100644
--- a/packages/discord.js-utilities/src/lib/PaginatedMessages/PaginatedMessage.ts
+++ b/packages/discord.js-utilities/src/lib/PaginatedMessages/PaginatedMessage.ts
@@ -507,7 +507,7 @@ export class PaginatedMessage {
 
 	// #region private class fields
 	/** The response we send when someone gets into an invalid flow */
-	#thisMazeWasNotMeantForYouContent = { content: "This maze wasn't meant for you...what did you do." };
+	readonly #thisMazeWasNotMeantForYouContent = { content: "This maze wasn't meant for you...what did you do." };
 	// #endregion
 
 	/**
@@ -1202,16 +1202,16 @@ export class PaginatedMessage {
 	public addPageAction(action: PaginatedMessageAction, index: number): this {
 		if (index < 0 || index > this.pages.length - 1) throw new Error('Provided index is out of bounds');
 
-		if (!this.pageActions[index]) {
-			this.pageActions[index] = new Map<string, PaginatedMessageAction>();
-		}
+		const pageActionAtIndex = this.pageActions[index] ?? new Map<string, PaginatedMessageAction>();
 
 		if (actionIsLinkButton(action)) {
-			this.pageActions[index]!.set(action.url, action);
+			pageActionAtIndex.set(action.url, action);
 		} else if (actionIsButtonOrMenu(action)) {
-			this.pageActions[index]!.set(action.customId, action);
+			pageActionAtIndex.set(action.customId, action);
 		}
 
+		this.pageActions[index] = pageActionAtIndex;
+
 		return this;
 	}
 	// #endregion
@@ -1328,7 +1328,7 @@ export class PaginatedMessage {
 		if (this.collector) {
 			this.collector.once('end', () => {
 				PaginatedMessage.messages.delete(messageId);
-				PaginatedMessage.handlers.delete(target!.id);
+				PaginatedMessage.handlers.delete(target.id);
 			});
 
 			PaginatedMessage.messages.set(messageId, this);
@@ -1467,8 +1467,7 @@ export class PaginatedMessage {
 				filter: (interaction) => {
 					if (!isNullish(this.response) && interaction.isMessageComponent()) {
 						const customIdValidation =
-							this.actions.has(interaction.customId) ||
-							this.pageActions.some((actions) => actions && actions.has(interaction.customId));
+							this.actions.has(interaction.customId) || this.pageActions.some((actions) => actions?.has(interaction.customId));
 
 						if (isAnyInteraction(messageOrInteraction) && messageOrInteraction.ephemeral) {
 							return interaction.user.id === targetUser.id && customIdValidation;
@@ -1602,7 +1601,7 @@ export class PaginatedMessage {
 					handler: this,
 					author: targetUser,
 					channel,
-					response: this.response!,
+					response: this.response,
 					collector: this.collector!
 				});
 
diff --git a/packages/discord.js-utilities/src/lib/PaginatedMessages/PaginatedMessageTypes.ts b/packages/discord.js-utilities/src/lib/PaginatedMessages/PaginatedMessageTypes.ts
index 6bb6b50fe6..3d0e992a05 100644
--- a/packages/discord.js-utilities/src/lib/PaginatedMessages/PaginatedMessageTypes.ts
+++ b/packages/discord.js-utilities/src/lib/PaginatedMessages/PaginatedMessageTypes.ts
@@ -346,7 +346,7 @@ export interface PaginatedMessageInternationalizationContext {
  * Represents the parameters for safely replying to an interaction.
  * @template T - The type of message method ('edit', 'reply', or never).
  */
-export interface SafeReplyToInteractionParameters<T extends 'edit' | 'reply' | never = never> {
+export interface SafeReplyToInteractionParameters<T extends 'edit' | 'reply' = never> {
 	/**
 	 * The message or interaction to reply to.
 	 */
diff --git a/packages/event-iterator/src/index.ts b/packages/event-iterator/src/index.ts
index c3e1ecacb4..40b36d0587 100644
--- a/packages/event-iterator/src/index.ts
+++ b/packages/event-iterator/src/index.ts
@@ -52,7 +52,7 @@ export class EventIterator<V extends unknown[]> implements AsyncIterableIterator
 	/**
 	 * The amount of idle time in ms before moving on.
 	 */
-	#idle?: number;
+	readonly #idle?: number;
 
 	/**
 	 * The queue of received values.
@@ -67,17 +67,17 @@ export class EventIterator<V extends unknown[]> implements AsyncIterableIterator
 	/**
 	 * The limit before ending the EventIterator.
 	 */
-	#limit: number;
+	readonly #limit: number;
 
 	/**
 	 * The timer to track when this will idle out.
 	 */
-	#idleTimer: NodeJS.Timeout | undefined | null = null;
+	readonly #idleTimer: NodeJS.Timeout | undefined | null = null;
 
 	/**
 	 * The push handler with context bound to the instance.
 	 */
-	#push: (this: EventIterator<V>, ...value: V) => void;
+	readonly #push: (this: EventIterator<V>, ...value: V) => void;
 
 	/**
 	 * @param emitter The event emitter to listen to.
diff --git a/packages/event-iterator/tests/lib/MockEmitter.ts b/packages/event-iterator/tests/lib/MockEmitter.ts
index 135c2e09c0..a8ee3e3c37 100644
--- a/packages/event-iterator/tests/lib/MockEmitter.ts
+++ b/packages/event-iterator/tests/lib/MockEmitter.ts
@@ -7,7 +7,7 @@ export class PeopleIterator extends EventIterator<[Person]> {}
 export const people = [new Person('Anna'), new Person('Bob'), new Person('Joe')];
 
 export class PeopleEmitter extends EventEmitter {
-	#people = people;
+	readonly #people = people;
 
 	#emitted = 0;
 
diff --git a/scripts/vitest.config.ts b/scripts/vitest.config.ts
index dbe603b985..1161aea2a4 100644
--- a/scripts/vitest.config.ts
+++ b/scripts/vitest.config.ts
@@ -1,7 +1,7 @@
 import type { ESBuildOptions } from 'vite';
-import { defineConfig, type UserConfig } from 'vitest/config';
+import { defineConfig, type ViteUserConfig } from 'vitest/config';
 
-export const createVitestConfig = (options: UserConfig = {}) =>
+export const createVitestConfig = (options: ViteUserConfig = {}) =>
 	defineConfig({
 		...options,
 		test: {