ElggCrypto code style fixes to match master