Use acquire where needed, split refinment humongous and non to simplify. Reviewed-by: tschatzl, ehelin