Remove a good bit of obfuscated and duplicated code.
Signed-off-by: NMartin Brandenburg <martin@omnibond.com>