Rewored the decl syntax a bit.