[PATCH] x86_64: miscellaneous cleanup