Reduce the number of files

[zocky]

Currently we rely too much on wrapping anything that could potentially be a block of multiple commands into a separate function. This produces one-line functions, which should be inlined in the parent block.