This significantly increases readability. This patch is pretty big so it is being done after mostly everything has settled. Signed-off-by: Ophestra <cat@gensokyo.uk>
Signed-off-by: Ophestra <cat@gensokyo.uk>