Moved method shorthands into their own file.